menu button: Make final

diff --git a/gtk/gtkmenubutton.c b/gtk/gtkmenubutton.c
index 80ad5affd5c90c8af74c95eb6c03117c60a9fb36..a92e9e48afaff06d4d5fff16a2c37a37eac61701 100644 (file)
--- a/gtk/gtkmenubutton.c
+++ b/gtk/gtkmenubutton.c
@@ -126,6 +126,19 @@
 
 #include "a11y/gtkmenubuttonaccessible.h"
 
+typedef struct _GtkMenuButtonClass   GtkMenuButtonClass;
+typedef struct _GtkMenuButtonPrivate GtkMenuButtonPrivate;
+
+struct _GtkMenuButton
+{
+  GtkWidget parent_instance;
+};
+
+struct _GtkMenuButtonClass
+{
+  GtkWidgetClass parent_class;
+};
+
 struct _GtkMenuButtonPrivate
 {
   GtkWidget *button;

diff --git a/gtk/gtkmenubutton.h b/gtk/gtkmenubutton.h
index 28d9612cdc4a857a1136a892a1127b45b66235e9..ad97d2b4fe44aff8af5714beb07f382d72125fd5 100644 (file)
--- a/gtk/gtkmenubutton.h
+++ b/gtk/gtkmenubutton.h
@@ -33,30 +33,9 @@ G_BEGIN_DECLS
 
 #define GTK_TYPE_MENU_BUTTON            (gtk_menu_button_get_type ())
 #define GTK_MENU_BUTTON(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MENU_BUTTON, GtkMenuButton))
-#define GTK_MENU_BUTTON_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_MENU_BUTTON, GtkMenuButtonClass))
 #define GTK_IS_MENU_BUTTON(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_MENU_BUTTON))
-#define GTK_IS_MENU_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MENU_BUTTON))
-#define GTK_MENU_BUTTON_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_MENU_BUTTON, GtkMenuButtonClass))
 
 typedef struct _GtkMenuButton        GtkMenuButton;
-typedef struct _GtkMenuButtonClass   GtkMenuButtonClass;
-typedef struct _GtkMenuButtonPrivate GtkMenuButtonPrivate;
-
-struct _GtkMenuButton
-{
-  GtkWidget parent_instance;
-};
-
-struct _GtkMenuButtonClass
-{
-  GtkWidgetClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
 
 GDK_AVAILABLE_IN_ALL
 GType        gtk_menu_button_get_type       (void) G_GNUC_CONST;